From 6328d1b48efeaef95f8c90aafd34454d30516620 Mon Sep 17 00:00:00 2001 From: thiagopnts Date: Mon, 14 Jul 2014 22:45:27 -0300 Subject: [PATCH] Minor fixes for code style consistency --- src/cargo/core/dependency.rs | 3 +-- src/cargo/core/manifest.rs | 4 +--- src/cargo/core/package_id.rs | 4 +--- src/cargo/core/resolver.rs | 10 +++------- src/cargo/core/version_req.rs | 18 ++++++------------ src/cargo/lib.rs | 17 +++++------------ src/cargo/ops/cargo_clean.rs | 3 +-- src/cargo/ops/cargo_read_manifest.rs | 9 +++------ src/cargo/ops/cargo_rustc/mod.rs | 6 ++---- src/cargo/util/toml.rs | 10 +++------- 10 files changed, 26 insertions(+), 58 deletions(-) diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs index 9fe2e08dc..91f9766c0 100644 --- a/src/cargo/core/dependency.rs +++ b/src/cargo/core/dependency.rs @@ -11,8 +11,7 @@ pub struct Dependency { impl Dependency { pub fn parse(name: &str, version: Option<&str>, - namespace: &SourceId) -> CargoResult - { + namespace: &SourceId) -> CargoResult { let version = match version { Some(v) => try!(VersionReq::parse(v)), None => VersionReq::any() diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index fb43b1c43..cc5112903 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -321,9 +321,7 @@ impl Target { pub fn lib_target(name: &str, crate_targets: Vec, src_path: &Path, profile: &Profile, - metadata: &Metadata) - -> Target - { + metadata: &Metadata) -> Target { Target { kind: LibTarget(crate_targets), name: name.to_string(), diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs index 6225d1c15..48c91b9f1 100644 --- a/src/cargo/core/package_id.rs +++ b/src/cargo/core/package_id.rs @@ -141,9 +141,7 @@ impl Show for PackageId { } impl>> - Decodable> - for PackageId -{ + Decodable> for PackageId { fn decode(d: &mut D) -> CargoResult { let (name, version, source_id): (String, String, SourceId) = try!(Decodable::decode(d)); diff --git a/src/cargo/core/resolver.rs b/src/cargo/core/resolver.rs index 69f03fc24..35de124c2 100644 --- a/src/cargo/core/resolver.rs +++ b/src/cargo/core/resolver.rs @@ -51,8 +51,7 @@ impl<'a, R: Registry> Context<'a, R> { } pub fn resolve(root: &PackageId, deps: &[Dependency], registry: &mut R) - -> CargoResult -{ + -> CargoResult { log!(5, "resolve; deps={}", deps); let mut context = Context::new(registry); @@ -62,9 +61,7 @@ pub fn resolve(root: &PackageId, deps: &[Dependency], registry: &mu fn resolve_deps<'a, R: Registry>(parent: &PackageId, deps: &[Dependency], - ctx: &mut Context<'a, R>) - -> CargoResult<()> -{ + ctx: &mut Context<'a, R>) -> CargoResult<()> { if deps.is_empty() { return Ok(()); } @@ -127,8 +124,7 @@ mod test { use util::CargoResult; fn resolve(pkg: &PackageId, deps: &[Dependency], registry: &mut R) - -> CargoResult> - { + -> CargoResult> { Ok(try!(super::resolve(pkg, deps, registry)).iter().map(|p| p.clone()).collect()) } diff --git a/src/cargo/core/version_req.rs b/src/cargo/core/version_req.rs index eec151067..a97380fc5 100644 --- a/src/cargo/core/version_req.rs +++ b/src/cargo/core/version_req.rs @@ -307,8 +307,7 @@ impl<'a> Iterator> for Lexer<'a> { if self.state == LexInit { self.state = LexStart; next!(); - } - else { + } else { c = self.c; idx = self.idx; } @@ -336,8 +335,7 @@ impl<'a> Iterator> for Lexer<'a> { else if c == ',' { self.state = LexInit; return Some(Comma); - } - else { + } else { self.state = LexErr; return None; } @@ -345,8 +343,7 @@ impl<'a> Iterator> for Lexer<'a> { LexAlphaNum => { if c.is_alphanumeric() { next!(); - } - else { + } else { self.state = LexStart; return flush!(LexAlphaNum); } @@ -354,8 +351,7 @@ impl<'a> Iterator> for Lexer<'a> { LexSigil => { if is_sigil(c) { next!(); - } - else { + } else { self.state = LexStart; return flush!(LexSigil); } @@ -408,13 +404,11 @@ impl fmt::Show for VersionReq { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { if self.predicates.is_empty() { try!(write!(fmt, "*")); - } - else { + } else { for (i, ref pred) in self.predicates.iter().enumerate() { if i == 0 { try!(write!(fmt, "{}", pred)); - } - else { + } else { try!(write!(fmt, ", {}", pred)); } } diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index a20ea11b5..0b6126804 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -97,17 +97,14 @@ pub fn execute_main<'a, T: Flags, U: RepresentsJSON, V: Encodable, io::IoError>>( - exec: fn(T, U, &mut MultiShell) -> CliResult>) -{ + exec: fn(T, U, &mut MultiShell) -> CliResult>) { fn call<'a, T: Flags, U: RepresentsJSON, V: Encodable, io::IoError>>( exec: fn(T, U, &mut MultiShell) -> CliResult>, shell: &mut MultiShell, - args: &[String]) - -> CliResult> - { + args: &[String]) -> CliResult> { let flags = try!(flags_from_args::(args)); let json = try!(json_from_stdin::()); @@ -120,16 +117,13 @@ pub fn execute_main<'a, pub fn execute_main_without_stdin<'a, T: Flags, V: Encodable, io::IoError>>( - exec: fn(T, &mut MultiShell) -> CliResult>) -{ + exec: fn(T, &mut MultiShell) -> CliResult>) { fn call<'a, T: Flags, V: Encodable, io::IoError>>( exec: fn(T, &mut MultiShell) -> CliResult>, shell: &mut MultiShell, - args: &[String]) - -> CliResult> - { + args: &[String]) -> CliResult> { let flags = try!(flags_from_args::(args)); exec(flags, shell) } @@ -169,8 +163,7 @@ fn process<'a, pub fn process_executed<'a, T: Encodable, io::IoError>>( result: CliResult>, - shell: &mut MultiShell) -{ + shell: &mut MultiShell) { match result { Err(e) => handle_error(e, shell), Ok(encodable) => { diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs index 2301f8a0c..35ec741f5 100644 --- a/src/cargo/ops/cargo_clean.rs +++ b/src/cargo/ops/cargo_clean.rs @@ -7,8 +7,7 @@ use util::toml::{project_layout}; /// Cleans the project from build artifacts. -pub fn clean(manifest_path: &Path) -> CargoResult<()> -{ +pub fn clean(manifest_path: &Path) -> CargoResult<()> { let mut file = try!(File::open(manifest_path)); let data = try!(file.read_to_end()); let layout = project_layout(&manifest_path.dir_path()); diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs index cd40e866a..2246d2215 100644 --- a/src/cargo/ops/cargo_read_manifest.rs +++ b/src/cargo/ops/cargo_read_manifest.rs @@ -7,14 +7,12 @@ use util::important_paths::find_project_manifest_exact; use util::toml::{Layout, project_layout}; pub fn read_manifest(contents: &[u8], layout: Layout, source_id: &SourceId) - -> CargoResult<(Manifest, Vec)> -{ + -> CargoResult<(Manifest, Vec)> { util::toml::to_manifest(contents, source_id, layout).map_err(human) } pub fn read_package(path: &Path, source_id: &SourceId) - -> CargoResult<(Package, Vec)> -{ + -> CargoResult<(Package, Vec)> { log!(5, "read_package; path={}; source-id={}", path.display(), source_id); let mut file = try!(File::open(path)); let data = try!(file.read_to_end()); @@ -27,8 +25,7 @@ pub fn read_package(path: &Path, source_id: &SourceId) } pub fn read_packages(path: &Path, - source_id: &SourceId) -> CargoResult> -{ + source_id: &SourceId) -> CargoResult> { let mut all_packages = Vec::new(); let mut visited = HashSet::::new(); diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 989889eac..f37df6373 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -34,8 +34,7 @@ fn uniq_target_dest<'a>(targets: &[&'a Target]) -> Option<&'a str> { pub fn compile_targets<'a>(env: &str, targets: &[&'a Target], pkg: &'a Package, deps: &PackageSet, resolve: &'a Resolve, - config: &'a mut Config<'a>) -> CargoResult<()> -{ + config: &'a mut Config<'a>) -> CargoResult<()> { if targets.is_empty() { return Ok(()); } @@ -228,8 +227,7 @@ fn build_base_args(into: &mut Args, target: &Target, crate_types: &[&str], cx: &Context, - plugin: bool) -{ + plugin: bool) { let metadata = target.get_metadata(); // TODO: Handle errors in converting paths into args diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs index 85b525537..a2fd7b369 100644 --- a/src/cargo/util/toml.rs +++ b/src/cargo/util/toml.rs @@ -80,8 +80,7 @@ pub fn project_layout(root_path: &Path) -> Layout { pub fn to_manifest(contents: &[u8], source_id: &SourceId, layout: Layout) - -> CargoResult<(Manifest, Vec)> -{ + -> CargoResult<(Manifest, Vec)> { let contents = try!(str::from_utf8(contents).require(|| { human("Cargo.toml is not valid UTF-8") })); @@ -286,8 +285,7 @@ fn inferred_test_targets(layout: &Layout) -> Option> { impl TomlManifest { pub fn to_manifest(&self, source_id: &SourceId, layout: &Layout) - -> CargoResult<(Manifest, Vec)> - { + -> CargoResult<(Manifest, Vec)> { let mut sources = vec!(); let mut nested_paths = vec!(); @@ -463,9 +461,7 @@ fn normalize(lib: Option<&[TomlLibTarget]>, bin: Option<&[TomlBinTarget]>, example: Option<&[TomlExampleTarget]>, test: Option<&[TomlTestTarget]>, - metadata: &Metadata) - -> Vec -{ + metadata: &Metadata) -> Vec { log!(4, "normalizing toml targets; lib={}; bin={}; example={}; test={}", lib, bin, example, test); -- 2.30.2